From d1406a6f2e20764485c930b46bcc3eb68a4c43ae Mon Sep 17 00:00:00 2001 From: "robertlipe@gmail.com" Date: Mon, 3 Oct 2011 01:31:38 +0000 Subject: [PATCH] Bump version #'s. Maybe someday translations will work on Mac _and_ Windows at the same time. Grrr. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4096 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/Makefile.in | 5 +-- gpsbabel/configure | 6 ++-- gpsbabel/configure.in | 6 ++-- gpsbabel/gbversion.h | 4 +-- gpsbabel/gui/app.pro | 2 +- gpsbabel/gui/gpsbabelfe.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/gpsbabelfe_de.qm | Bin 54696 -> 54623 bytes gpsbabel/gui/gpsbabelfe_de.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/gpsbabelfe_es.qm | Bin 67008 -> 66925 bytes gpsbabel/gui/gpsbabelfe_es.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/gpsbabelfe_fr.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/gpsbabelfe_hu.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/gpsbabelfe_it.qm | Bin 69912 -> 69827 bytes gpsbabel/gui/gpsbabelfe_it.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/gpsbabelfe_ru.qm | Bin 66237 -> 66164 bytes gpsbabel/gui/gpsbabelfe_ru.ts | 56 +++++++++++++++++----------------- gpsbabel/gui/mainwinui.ui | 2 +- gpsbabel/gui/setup.iss | 6 ++-- gpsbabel/gui/setup.iss.in | 35 ++++++--------------- gpsbabel/tools/mac-config | 4 +-- gpsbabel/tools/mac-localize | 7 +++-- gpsbabel/tools/mkchanges | 25 +++++++++++++++ gpsbabel/tools/mkdmg | 8 ++--- gpsbabel/xcsv.c | 4 ++- 24 files changed, 259 insertions(+), 247 deletions(-) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index b29ea0a52..5aa2321df 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -352,10 +352,11 @@ mac-gui: gpsbabel cd gui ; qmake && make cd gui ; lupdate app.pro cd gui ; lrelease app.pro - mkdir gui/objects/GPSBabelFE.app/Contents/MacOS/translations + [ ! -d gui/objects/GPSBabelFE.app/Contents/MacOS/translations ] && \ + mkdir -p gui/objects/GPSBabelFE.app/Contents/MacOS/translations cp gui/*.qm gui/objects/gpsbabelFE.app/Contents/MacOS/translations cp gpsbabel gui/objects/GPSBabelFE.app/Contents/MacOS - cp -r gui/help gui/objects/GPSBabelFE.app/Contents/MacOS + cp -r gui/help/*.html gui/objects/GPSBabelFE.app/Contents/MacOS cp gui/gmapbase.html gui/objects/GPSBabelFE.app/Contents/MacOS tools/mac-localize diff --git a/gpsbabel/configure b/gpsbabel/configure index e732bdf24..f0b3116ea 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -1745,13 +1745,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu DOCVERSION=`echo $PACKAGE_VERSION` # 1.4.1 is a tiny tweak to 1.4.0. Use that doc. -DOCVERSION=1.4.2 +DOCVERSION=1.4.3 # Increase GBBUILD for a new release -GBBUILD=22 +GBBUILD=23 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -# PACKAGE_RELEASE="-beta20100518" +PACKAGE_RELEASE="-beta20111002" # DOCVERSION=development cat >>confdefs.h <<_ACEOF diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index b10eb7c89..4a0f3c624 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -7,13 +7,13 @@ AC_INIT(GPSBabel, 1.4.2, BUG-REPORT-ADDRESS) DOCVERSION=`echo $PACKAGE_VERSION` # 1.4.1 is a tiny tweak to 1.4.0. Use that doc. -DOCVERSION=1.4.2 +DOCVERSION=1.4.3 # Increase GBBUILD for a new release -GBBUILD=22 +GBBUILD=23 # YYYYMMDD, please, if beta, i.e. "-beta20060413" -# PACKAGE_RELEASE="-beta20100518" +PACKAGE_RELEASE="-beta20111002" # DOCVERSION=development AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.]) AC_SUBST(PACKAGE_RELEASE) diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h index cd23a18e3..a3b7bedfe 100644 --- a/gpsbabel/gbversion.h +++ b/gpsbabel/gbversion.h @@ -4,5 +4,5 @@ * * Isn't simplification via automation grand? */ -#define VERSION "1.4.2" -#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.2" +#define VERSION "1.4.2-beta20111002" +#define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-1.4.3" diff --git a/gpsbabel/gui/app.pro b/gpsbabel/gui/app.pro index a168a5c74..9fc5b95ae 100755 --- a/gpsbabel/gui/app.pro +++ b/gpsbabel/gui/app.pro @@ -6,7 +6,7 @@ CONFIG += qt release # For Mac, build Universal binary. Ignored on other OSes. # QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk -CONFIG += x86 ppc +CONFIG -= x86 _64 ICON = images/appicon.icns diff --git a/gpsbabel/gui/gpsbabelfe.ts b/gpsbabel/gui/gpsbabelfe.ts index 913515b81..5d6bb5cd6 100644 --- a/gpsbabel/gui/gpsbabelfe.ts +++ b/gpsbabel/gui/gpsbabelfe.ts @@ -634,144 +634,144 @@ p, li { white-space: pre-wrap; } + - default - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsucessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active diff --git a/gpsbabel/gui/gpsbabelfe_de.qm b/gpsbabel/gui/gpsbabelfe_de.qm index b2a80d69557add7e573f8df1a7d1147705fcf27d..9e879819a6b376a50c34a14e5b4c826f20f2cd89 100644 GIT binary patch delta 1804 zcmX90k$c@Xbea-1W;h{BG}Fe&lI2iJ9do7BSW>y9bSg6) zOG?9B9VtdCOA0wzW{jmF9A_}nIG97`&Hd~7e!uVcd*A1M-sgM2!_~}#BTRvfl~bW@ ztZ^j3WCN?G5bh>i4)8aC;tha6?~31Auwwux042e6#zgxaK5ukJg+ujP) z7lZ9|1?)9oZ{-30vn?1~Yr*;!uzwT)<-TB_>j0xX!}2g9#)2XJ;Kr;1PVEF2b{^Q2 z32xq0fc*e2v6R-0;C8UU*m2+v65(cmtBwP5CGb@Y5gP@*mWUP406##;dL@M5NFurl z!a$soeGp13341X-xf@2rIUqQ$0*Jkfa1W|F{ywIcBoIRlA{UnfjWLM4bd#7?V~(r^ zX!1o=8wHjh!on3NfSfQaJWND#?jTx0m78>kt9S)$9D~(KCL&UScmu zrJhiHIe=5>g~7667;3?gbI31w2!vaqu+;__?SsRvFNshBs-9*5$xC34l1Sq9X#FvU zh&?p<%G~t6Ryo?^fV>yElu`_I3g4rHrfN52X4F##Q@0 z;N!%2g&JtTfzhw80TfzBUqRjTH8O!&4B)(k`TBF*W+vi6Bz3KjS@^tw*m2Co+C4x* z&UWTuLnm;thv~V#2+$~*cOCYCT?D(T-J6QO!>0LV18y7GjG;ux`8d0!R!`!rVGp)Z zfV7!xjn@IdFO;phMr%7K_Lr>rBXeG&d=r;khGr*tT9m!S#HK;!n7Z_ z2<8=;s+Wtz5J3NdOFBut_1Mg<=gdHynae%aLg)8$MVATH{uUe?XF>nlT-jBMBiqeY z`q90qx445gl~k4kXFicha{kBFFD03b9(7!Ox-&Js(Sp`83+me~7~I1(M3K%J-*DHS zb&>wBx&BB00E1h&Pjg)W+eY5gn!Mm9@MHHx0_R%!1zR7}r<%gY{6z(LPUmA|NFMhE zdd7g&Z8yT1^0>&eYS zcL|>rvMv@vPj01(qJ&v|58$E|<_D|=O3Q>yGZm6>R>;<8k=q-E?cS7#+bn!m$dE0R z4Wl?-eu8-=5gRd7pu&x0`#Pb!lp1ARA^cnHL;m|t)NW4(M#{v|mx(}Nrs#deKtt%Z z7!XVjJF{GzymdM`>V~-Bs0s)fCN5{mVdLkCD>S5#M-jD*<#SMQlKvE}R-F?8JPih#LyjF?Q z&D+61`grN?)MG$^LhhAA!j;M7`n6X9Zx?yc+-KDKv8FuUQGZ6Bx`|lDe<81C>2yn` z{PYfDZI~&4k~kCC(yH)GolK5)RCq0lp{zSi_jpHZPeoPNWng%|;!PsuF8kS}5*&=4 zPnBbu&ym*U%8B+m;HwPfs$9~x{GhVv0%@p-SMFW>l0H60*)}kVPMuXTHPi!pvr73i zh};KN@_W)gBwCg4Nz$a9Rh?WDNK$-K)d%^|#JZyD8{PygcT=mosFX>S>IuC=$UL#? z@MS$Pz&2F9xRXYnE?J$fB`sWDt20LtKh{;fV_G-;aSGJUeUy-MQQv+|*wkgZC)io% zY5d>4BCA}{1RXsDOu1{~L`R2gO^2U>{z$2s?zT=~$9qj*EyXbPF9WVPn0~XLWZo!t LXwBO^9gh4D1J(fw delta 1845 zcmX9<3sj707=D`nK36nMwCSR<4jZ!Twz?=1BbV;l-O=jeQq)dVqS)L^ z%NdS@T_&L23gUtR0rc7(+Sw1k{ z6bCQ`!16-E3c?0}zX4RW0D?169caVLeK?Mu^J$HlPz7YC1KT9XiXH+=7qFMk0nN9; zcIyEr4cK2wfw5*A#{Xl(6D-) zQ+)?QO+69!hhs($Oh|}FXhI#3;EZUmTws99suE_NWFe1k87^VT={~*)9?MJk_WuHXZ0rpl|V9<16s6iI;p%;jHX)cxN zOs`~_iZK)`SXOMk3aET#?*lAU#_bGuo_3%1VFm<~x|Qb`*B93T^vuVnzYeaz&Kaji_uy;!Q+HD>P9GGZ6STxi+? z%qZ$)?xd&CLWX(J(hXeHGmow&0U9Oqw$lmF#jt6Ye1N*aY)(J{;L*b74I*N0FWJH- zKN9H(ySJSJ<&?9H-g|(60`oFPXLs0K$at7?xB%^8z<8evZZuQnBDtyIggHNRG0bxy z-=B+xJ>dT-XFN_7^=jp^I14%96<2(?mDbih@FZbY;3}Zzu8?mbj!6&- z{MM3v-w7LiC@S}z@G*Hqo3O)yZ0?;cSe6ls!Gna4IT_vvJvAh_sZn@UHJU`I6QOP2Ak6qjl!dC5yO z`o5-guZp>M7+_+6xY~Xwkl872I5d#jfE6pNh5`M`#p)5q0MBp4mR)63@fNXlG^Ob} zQ0&NW1;!VMo$YNvqPzJ1z(XLSUXm`(q0(L~m{Z@4WJ`3d`UpxWMrkM+Q z7rzhk>@~zGalX8PrPZxg`Kb~jZ77%jnKF%r45t{G9S-;WVn0-}yNLnstkgOvL6;2&e61YXMBlwVm7dnK)TOn`ASYj7(kW$HF-czg zSh@8)NvlXyRwh5A=9;K%@0&O+P%({E8YhcN`8b3e7^cejmr4@0UA1{6DQ3!r>iCLa z(l}Jr95R|}rB?Mio&lCDR;#a5lH(t#$Gxy8Q|(kor;_OgMyQj!X|(wsQ?GWd0Q3fR z{xBlO>eVHm_0T`dRkgL34&;WbZ@nZut5yI0YZ-ZCk@|VaZtAQh8m)06d811+_U&^h z@RM2-a%dkA>1=*4xD092bOsnG>ugO=dpA%Tr0H# MainWindow + - default default - + Select one or more input files eine oder mehrere Originaldateien markieren - + Output File Name Zieldatei-Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -479,7 +479,7 @@ This program cannot continue. Das Programm muss abgebrochen werden. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -488,114 +488,114 @@ This program cannot continue. Das Prgramm muss abgebrochen werden. - + Input and output formats do not support %1 Keine Unterstützung für %1 im Ein- oder Ausgabeformat - + Input does not support %1; output format supports %2 Keine Unterstützung für %1 im Eingabeformat; Ausgabeformat unterstützt %2 - + Input format supports %1; output format does not support %2 Eingabeformat unterstützt %1. Keine Unterstützung für %2 im Ausgabeformat - + Both input and output formats support %1 Ein- und Ausgabeformat unterstützen %1 - + waypoints Wegpunkte - + tracks tracks - + routes Routen - + There are no input options for format "%1" Es gibt keine Eingabeoptionen für das Format "%1" - - + + Options for %1 Optionen für %1 - + There are no output options for format "%1" Es gibt keine Ausgabeoptionen für das Format "%1" - + No valid waypoints/routes/tracks translation specified keine gültige Angabe von Wegpunkt-/Routen-/Trackfiltern - + No input file specified keine Quelldatei angegeben - + No valid output specified keine gültiges Ziel angegeben - + No output file specified keine Zieldatei angegeben - + Process "%1" did not start Prozess "%1" wurde nicht gestartet - + Process exited unsucessfully with code %1 Prozess endete mit code %1 - + Translation successful Konvertierung erfolgreich - + Error running gpsbabel: %1 Fehler beim Aufruf von gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Sind Sie sicher, dass Sie alle Formatoptionen auf die Vorgaben stellen wollen? - + About %1 Über %1 - + One or more data filters are active Einer oder mehrere Datenfilter sind aktiviert - + No data filters are active Keine Datenfilter sind aktiv diff --git a/gpsbabel/gui/gpsbabelfe_es.qm b/gpsbabel/gui/gpsbabelfe_es.qm index 2a7e074274e00a729c5573ae3404a9a0a709c368..667f5fbb5f12d42c7514b406eafdb770f17e8b89 100644 GIT binary patch delta 1872 zcmX90DlGOeG?F76ONj3s*=zf=<@)!%k;e!$Vj90B`ET)1BCs)q`DxFTlT1>oZj#8eZJ<^XK6q|V!`5nnzAG<=Hf$ubd;OT*l1Tj}LR6wv9kp8|Pa`O5f||)&>xs_2I&pF^bCfTm)=@*eou& zi5%Owm)pe|$Z;c=-`EC>y}=#tC0ugLjM3-KsMB#}15{_xM_h#`o!jNaRoPZhGJ-k7 zg>2ei!!;-BC_)=+x#qnNfctqf`dFAT_9Zi>G;=LcByT;>4UP=c;~3zkuipdw3b=cE8`)xHd@eUYE`as#?+1d9P$Pi_-fhA!UFCAjUPjIQVu9x3G0Cai2a2<()F zb^HxdK2M1B+5ucH7P1Z0h-?&c-E)ABIHACmE^@gk9Lpf0zTv_nrQ)W9vL~osRH{&U zNuLJnSS}deB&I>r!XqW(orG(pWL;yP@aG8+lJ2-@Uyu&09uw#H5}~bX(e?5Rfb(Ob zmp=vV?o(pG!4MiFIx)Il4Wx{TTiH6Y>_>5%6)E=oS~1z}J}FWt?)i=Z(x%0|HqQVb zx{8PN^)u>=TAt-(|!cj{3NxQ2JpgU>8o%2f!a~&`@lv(SE6*zBZ~)aDBX7q05Pe`WgAAw z@=@ig)-P%NWXqrPTK6zzMi$XN>aDD0>D0tx?h38JE)#DRbK3_@+!|EN&ZnSo#h7XS)@wI zCl8E9Rb~>^XnIw3yptsN_*YeuKw~O2Q`KV{S0iUsldT3)^q5J;btb>bX{Vyk}77XVMz>ROKxxTLk3 gXrLM$A19I7{bZc>eZ%zCG=*W7r4V9Bj$GgHKZ^)Ni2wiq delta 1830 zcmX9;3s{YJ82@#?`{|q$DraG$ga}0{N@CRN(S_({l9U{dYF#AF(lpmhd{LO&nkbd* zpj>8Dni4Y1Glnpi9%U!7HRRcw&hwn__x=Ch|Np+f_xE1fHnQh8vAGr|>$h6Y&-?;l zvVr}-5#|wg0{l&&p$ZT_1unbv;CmzC1X^bT2{NG?NJ|D9B`DTD2F4!-Ta*rX3;}z& z7In}L`MJ(%0sgU_46{*eo0Hu-^Vbp)IhJ?Jx|2NTDG8y*j|`~uGV zB57=P+A)b@{?C7v{w0wsc*f2$>oZG&TiByf?DWw z_;9&Qp|ww8xH>x9`jqM8LE_c_z}U3k0NgAYJL|83SIvx_O)RiLEw?GOQ`R#cYZxHV zn(?c?4!EW=fe%R12nQyjH5aHk%hZ){q<{tUYx#Ck#D}??90vqsFpo|*0iBleBt~l= z%C2z927(u}8GXrjU^M$}xf8G=nk}lQTO|Q(sl!2FVT`zi2>djR3x+umd70B!Qc^-La?3dbu&qD0u7X529^-a25V}6? z!SJpgjIH4ITqQdrj&g-AbZ_}`uE?U0lAp&Jj%U&NVy%OuC?5tBDIp2vD)yL{HX20REmXs_=YFIm;rp`Ln0S?g`Xcuk2v#ScbfW^pWqe+RXdHO#Uy@ z>$(u?mIPdB7P1V)C9l7b?X(8CSR!m1O;$%e5%SW8P$vcnA487v5%zpS^%-_XICw4@ zNZKeEmJuuO55mV-qLvHIyGieg>%!{-XOiHdXtOB=_}nNCr6$6XFmd#ianz{}y+k)J zDvGu^aq5N{)bg=nco~g>1b1->TMEp#7nhom7-RiKz2h4SKSxZz%K$09;!5*Dz@c<; zW0@tDb%dB-Fc_G)UfgMag5>ZQPanvogcpc4&J=dQV6h>q2GI2p8|yDp4*kWh;>Vba zw7}lSjkYIJ4xFQ-UMbXly)TF2mBsLr@JSk zycx{Z*Dd{S8!5O9JoEFNyi(JNAJMB`YttM{UvXw_z zI^D5ac{Yc*N0}?1#svW<^GrvkO$Fu|O&u0SlGmMb7eB0bt7-9#2AZ0_rf=fN_q9{< zc)>a|UNyY>0txPf%Dkr7*gRiN zVmy6MjMl8QA?boPX|e`WI1XQHa(tVC0|PbH9Ykc*R?Y2KgvLjjdv|iFa`H7s&mXDl zdYf73r%~m!o4IxxVT!gpW}an-fK+dJo@hO=*{soJ9N@y5HP<%*=c3Iz%E@ef&P((&Pg^76z-( H+2#KOJ&7<9 diff --git a/gpsbabel/gui/gpsbabelfe_es.ts b/gpsbabel/gui/gpsbabelfe_es.ts index 409f67c7b..32e95c852 100644 --- a/gpsbabel/gui/gpsbabelfe_es.ts +++ b/gpsbabel/gui/gpsbabelfe_es.ts @@ -505,144 +505,144 @@ p, li { white-space: pre-wrap; } MainWindow + - default Defecto - + Select one or more input files Seleccionar uno o más archivos de entrada - + Output File Name Nombre del fichero de salida - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. Se ha producido un error cuando se intentaba leer la configuración. Compruebe que el núcleo de "gpsbabel" está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. El formato de alfunos ficheros o dispositivos no se halló durante la inicialización. Compruebe que el núcleo de "gpsbabel" está instalado correctamente y que se halla en la RUTA actual. Este programa no puede continuar. - + Input and output formats do not support %1 Formatos de entrada y salida inadmisibles %1 - + Input does not support %1; output format supports %2 Formatos de entrada inadmisible %1; Formatos de salida inadmisible %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 Formatos de entrada y salida admisibles (ambos) %1 - + waypoints Puntos de interés - + tracks Registro de trazados - + routes Rutas - + There are no input options for format "%1" No hay opciones de entrada para el formato "%1" - - + + Options for %1 Opciones de %1 - + There are no output options for format "%1" No hay opciones de salida para el formato "%1" - + No valid waypoints/routes/tracks translation specified Se han especificicado puntos de interés, trazados o rutas no traducibles - + No input file specified No se ha especificado el fichero de entrada - + No valid output specified El fichero de salida no es válido - + No output file specified No se ha especificado el fichero de salida - + Process "%1" did not start El proceso "%1" no comenzó - + Process exited unsucessfully with code %1 El proceso terminó sin suerte y con el código %1 - + Translation successful Traducción realizada con éxito - + Error running gpsbabel: %1 Error ejecutando gpsbabel: %1 - + Are you sure you want to reset all format options to default values? ¿Estás seguro de que quieres volver a los formatos por defecto? - + About %1 Acerca de %1 - + One or more data filters are active Uno o más filtros de datos están activos - + No data filters are active Ningún filtro de datos está activo diff --git a/gpsbabel/gui/gpsbabelfe_fr.ts b/gpsbabel/gui/gpsbabelfe_fr.ts index a5bd8a596..2329e697e 100644 --- a/gpsbabel/gui/gpsbabelfe_fr.ts +++ b/gpsbabel/gui/gpsbabelfe_fr.ts @@ -444,144 +444,144 @@ p, li { white-space: pre-wrap; } MainWindow + - default - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 Options pour %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsucessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active diff --git a/gpsbabel/gui/gpsbabelfe_hu.ts b/gpsbabel/gui/gpsbabelfe_hu.ts index 2e4f1fc29..964edd307 100644 --- a/gpsbabel/gui/gpsbabelfe_hu.ts +++ b/gpsbabel/gui/gpsbabelfe_hu.ts @@ -444,144 +444,144 @@ p, li { white-space: pre-wrap; } MainWindow + - default - + Select one or more input files - + Output File Name - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. - + Input and output formats do not support %1 - + Input does not support %1; output format supports %2 - + Input format supports %1; output format does not support %2 - + Both input and output formats support %1 - + waypoints - + tracks - + routes - + There are no input options for format "%1" - - + + Options for %1 - + There are no output options for format "%1" - + No valid waypoints/routes/tracks translation specified - + No input file specified - + No valid output specified - + No output file specified - + Process "%1" did not start - + Process exited unsucessfully with code %1 - + Translation successful - + Error running gpsbabel: %1 - + Are you sure you want to reset all format options to default values? - + About %1 - + One or more data filters are active - + No data filters are active diff --git a/gpsbabel/gui/gpsbabelfe_it.qm b/gpsbabel/gui/gpsbabelfe_it.qm index b8674f24697d6cf70db0cb78c3190e8f1d04a9ce..eb9befcc398a62fd1ba05a2d1a7e78c67edf7a4e 100644 GIT binary patch delta 1890 zcmX9|4X}l4fgne) zm+OG1Ibd5HfDk9JH+BNc{;;4S!GcfEfxVRj=x(k8`^XjW3ASM9*A`4|1~)1R=v@bH z@&(}ZC2+HYfN{gX#UG@#3EU1Ah#Ls5kcj^`72L5{pn5m>Vul1{gD)e3t*6182?ZX2 zpb019%@E9S+FnCAm=7JUM`Ccw9l&r6n%F$TTuk|hlpN6E)7<&M%>aZi_zrkBAK{nU z>0vo$%4>m_n-I}Jfql{twe%El?qft15s_*wqOC~zl|_in>jr+hg5`;Nde90f=6iw9 zvC3c%EKy=rrMaw)N#9i+rcN|iEMwV%J63~Xq$`J}Q?Uy^4-T}@J)qf?o9Xwp_|55`?lgoomgj1Kv zL%Zno{CIt-+*TLPaP@Td#R#UqH@Vj;W9)j`06!nbVc2@$l{@2Lw~)w2FwOz)w7-{e zTU|n;I~lh;%Ffab#(NV3M9gKT*IWZMc}&RdaLUSZChAcRaT&|h|G<$c*38ASy=2k? z=C7(2$mENdyVv4?Fux~^sc8r>qk&Dj>;l|MVN*Rf19LC3>F*M;h{NobGB@(1hb?TN z04I%XiE{yvc$_V{O6wWB*yEe#P~GKQu>Gq35HnJ@mh-eZ0TfK)yi3UYmtovz{)8tV zav@ANQ02mfV*s$&j!Ued9LD_3t>%nCZYsC+L@k}~=Jqub`l&4#r?FsC1$U^K;&?3O z@;&L^`rBNgO+MAi8P0fW1IcgWDi@Pox>yIUGR+>CIMafGLoFEJW5G3rTvY`5eX5?j z+SNww(#^f@d;&}^=ibcv5SVVoJN2UynCr%m*&9yPE%K4s_W-ZEy!KBL5c`~u(ULvd zTt1y=2;b*-P6z-dwD8{_b3rs-mh%s7!+_aZ{Ie@};XOn^SF@kX!(FzR|-pWq+Rk(AIvQ$|u{A2JSKe9x-?J1P*L847KKsXd-z@??^VubZ(+(!2=$W{pPtqTAbuKX%~X@*hC>3#rOHf8F~_?HwAxct-jy=mZh!QaESQOzzMq+*USIW0@4b zv$}|JU%FyS&3Wp?_bg$AOH1cGy|p2ZWbj#j;oFie-H9A$pX zH%94|XLf0pa>5W-VB=(E(pE~#EpKId0>wC2uH08oS@0dD+`r&4HLsJh!92ivi2~T~rk-ys50}RF%FSG^V+|?s!VrXRr4WZTo4h$CW6r(vT0W#5!ayi1o7`*3!%(zRTnQeS;-mByP1BymU AF8}}l delta 1890 zcmXX{3sj707=C8{`!q8xMJ`J#iluc_x>2)9xvWdAT)I#pYN&~dC`@6IYy6_iv7s&6 zE-u5OV_kBMBua8`<#OygHj+DM-^|WAGtYeA|9$WGywCf5?|)_&o4uROv{tOy+$q9% z9bi@hdy5FS5>^9zJy7Qi2t5c(zoJ4MMd(T6HXvRmTmd8}0`*IwT-6Nd8o(AU2K*hs zUOo%Fx(Bw_9tao!wqXNc_#dPsp&j$hCxd^r)U$b z6GVi&LuijvKL$cx0gR|GLf51wAg3pMBJ+XlCm7kEGRdvR*qj+aV--vS)zhWJ>Shy)|4eV^YO zEXeK+%n8AQqrK&q3MqeVcQV|0TKm?(bo3(iu8(KzUe*D_ycv7jWx(e&#@=ogku78#hr7^x z7UQ&#EaBbEIOS7yV*4;&D;OZSnE9#l8sL-91Uv|$svKuRpJx)6<;?ltITB?mbD=zo zL^{CSNsOlT1DJ;uwNNOPCfS>@8FrdofOH*OR7Kkkf-Q9{ zq~kuZrB`V@W+S_A#T0T|ff*aVm9v<>#`Bz;^?smmJ?B+Qihs!G#`zK+^xy)R7P3q# z7X&LHCZ3BuLY0ejBkA^U8#k zPAh<#vBJ866xF>%*qYpjBn=e4ilBcl?C3(ap5Y=Co=5~zQv_2Su?qAPzUDZmpU{*? zB{`-MUS|&`QErHK>ym&8T||dVbb8`Kao`mfns==gJ$%SYZy$@k8Dpta$YMyDhTPs) zoWqipVlInwElG@_H^kUMZGdN>xcCkOEVUFb-I*kg{KL_;Dk!W{(sW`UQB}K?=(#AU*F&u>tMRXGyWMUjidEQd&$c zb&y7R9B(r^PFj0}=(Z(FS%vj5U%hU(H$x^dG7I3!AU{r6MzbW=I5 zG6FX@sGJgNfGB^JZqhTV=0&-T@9C`fRVAkpx!nG$5|);KaZnv!PvrG~s-8p#0w=y$ z3`q6`qPJK$&J3qxAIP8iz8#t@it8=`<8v(9qUrEPTiI2xH9lAOt2|ALN2opW+Y{fd z9@1?Puv}IfR+G}VGSsPhig8M*-gcgp)%8}Kse13h0nN}FOw+J)L`(|b`m zZaVGy(M|MndZn#wB_i%)v^QT7ew?ShcRLgC>aK0k{YDpYsHJtRA6ciw(*0cvEbuPe zQdhPISk_sdCffFlvaEJ<0e*D0Y^tgSE;w7ZmQ&c8d_5FmyeU_743rjEVwMQ{@bp!Uo31xZ(Ho-TlV#)lo~F9UmVN&L(V#-f diff --git a/gpsbabel/gui/gpsbabelfe_it.ts b/gpsbabel/gui/gpsbabelfe_it.ts index 756954383..97219a9d5 100644 --- a/gpsbabel/gui/gpsbabelfe_it.ts +++ b/gpsbabel/gui/gpsbabelfe_it.ts @@ -660,23 +660,23 @@ p, li { white-space: pre-wrap; } + - default predefinite - + Select one or more input files Selezionare uno o più file in ingresso - + Output File Name Nome del file in uscita - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -685,7 +685,7 @@ This program cannot continue. Questo programma non può proseguire. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -694,115 +694,115 @@ This program cannot continue. Questo programma non può proseguire. - + Input and output formats do not support %1 I formati di ingresso e di uscita non supportano %1 - + Input does not support %1; output format supports %2 L'ingresso non supporta %1, il formato di destinazione supporta %2 - + Input format supports %1; output format does not support %2 Il formato in ingresso supporta %1, il formato di destinazione non supporta %2 - + Both input and output formats support %1 I formati di origine e di destinazione supportano %1 - + waypoints punti di interesse - + tracks tracce - + routes rotte - + There are no input options for format "%1" Non ci sono opzioni in ingresso per il formato "%1" - - + + Options for %1 Opzioni per %1 - + There are no output options for format "%1" Non ci sono opzioni in uscita per il formato "%1" - + No valid waypoints/routes/tracks translation specified Non è stato specificato alcun punto di interesse/rotta/traccia - + No input file specified Il file di origine non è stato specificato - + No valid output specified Non è stata specificata una destinazione valida - + No output file specified Il file di destinazione non è stato specificato - + Process "%1" did not start Il processo "%1" non è stato avviato - + Process exited unsucessfully with code %1 Il processo è terminato con il codice di errorre %1 - + Translation successful Traduzione terminata con successo - + Error running gpsbabel: %1 Errore durante l'esecuzione di gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Si è certi di voler reimpostare tutte le opzioni dei formati ai valori predefiniti? - + About %1 Informazioni su %1 - + One or more data filters are active È attivo uno o più filtri di dati - + No data filters are active Nessun filtro di dati è attivo diff --git a/gpsbabel/gui/gpsbabelfe_ru.qm b/gpsbabel/gui/gpsbabelfe_ru.qm index 9b34020ff642752eec82a3908e4828f9aa373d76..19e8ad9600d04712663dd81db4c626044dd76878 100644 GIT binary patch delta 1852 zcmX9652#TB!a%|lGk!Qp=uYu1Al68@6o`)lYJDI}eFAtK0-L)T&^Lf> ztOi;agKc&MW~YIDun&lIFyn#AW^CO9_E9=uXmkYIF$$RY-i$sk%otYqwYoKu!^4k)D(af?i2Ya`SDtpldp$>#PDdgaS}+bKKr zS7VV(GhEAXHI)0jl^koPo}G-Nb}R6PV;t>P5Z4UjE1AZ?F&^6)V1a^} zRe6W9yqI}^kfdREnBb0d;OYgY<}61FL@>3*nWRWH^SGiJ=#FAq?<@ztImYxf^#^90 zVPhIyfF=ia)A(c{=qj7|C9zmApG_$qP5s|wbL;8-yim5#IR}VnXA5sr+;>I{dv1Fm zFm;|8>rNW87$?JUZoKt*AZs?~QAk3+e9z6%6XxyV<}q)9^A4OptbpZnxu`N4SjZ)A zBWD5*&gFKTucATj)qa;L`Adz)u+xz?x17#BEGNfPBJ zapkK>97D)Ut~|jWaCbH1lzKBR*P3zNX|5uO)Ge6C-EO~2ccX&)^yCdNP09VYzya_c z$dBwp^A1|Xf1T-1R?g)Y?RpAKu;Ii0qy`qB;FpAvKEauMBF_-o@cSlC1>DZ^CkkB1 z!X0z?ml{97ubcnmHVUXt6D)2~+!H9U3>_TeB#hcf7WIBCd{#&wEle%j1#GGn=JTy2 z{5>JiZ5>c|TSzidBN?7T^62frb%U_Sg$^25FJ#0MQT-?3vr^&Dg)AGY7aAkvT!~u@ zY;+V%(Ztl}xbRtt6$6EqV>G$qJfZuDD@k`nwA-^Dn42dKZ6HE1n?;wKV*%GeqMMF< z*6t?iclpp3nJ+FXqRq4Jfw-D2q>-I9W^o!rx|m=!7|8io++EaBkzS2liT>zkaAjzAky~qH` zI*#((TFq!2CfO%bHyc8wq2KHWl6FcV!JmLxj|NF0yG{WgrbtoqdJ}AB%lT?PRw$4I-&7~olpl$mpnh<6*e@R}h*q~E;G1FPNT z&Z!1kFbetTb+>>eesa$R?KFP1v6R=2mgMobnBw$Z&H8KJDM>wU0A z*=2hT_~Ermb(dO>PExsdT9MHPsJtV|h|^7~@MhY8-@aC@jiLYJx>N~v8NkBtRY^mr z9oGca-kB}*m71ce>>?uLqE!$7BJ8+moGfbmMfHT9x8$bFYR{rGWbfJPsm?CISe-f+ zv2>pvse?dqoSV@Z}5>X!Ou;G&@JDyHh!Ya(gZbu_ra{Y`6kw^^9> N%d7lM2SZ2Z{14#TIZ*%r delta 1839 zcmX9<3sj707=D`nKFv&4G1{{$BKJ#C6g8VcHd{oYo6J&FDvly*X;bb|`Q>^FC$**P zo?&%zPhzUIIk~L0c5`WM#FpZ?tajhgoHOV7zwiIP_j}&weZKeaPG`?=VY6&3wrBTS zlF|+^>A*1^;XXnGz~2Ju<^aN%gmu06?h&CIaLo!>CDZ(IATgfCyP??n7;xVYwr~TW zuLs*u3p~jM+vEUzlL_|DZXhb67qd6@;*&*?Eu0Csc!OJU1gIPjE`tTaD!~;J@s~6%A@V1FK?WB9epz^FDnZ z)*c)JMC``esv&Zxg|%D0`3Z=xM&=>XIjI8KwKl+_W)wNRBnG=s{4^Oj(G6puM4EP^ zc6%5xF~}Z@;kJPmTkU@Yg0n47!whU5ZBxC3x#%?7vrAB z01JGX*)=z5)l6pYpCsv$zD#g?7I5(uQ+JXh1&Ww!V@t;r0Fk5Qjf~dfk(|Q}Pl@Ix*;E3# z8Jv45Y1uxR^VJg;HF9&A4l+Xo=MQUOStb{AhH4V>kz2iORIVzL@>hh8kv&+gt%0jb8Un0o z<*EZou97X>FKx|a_78F_t4%q~kInH1UOeT4cC-SM2k>DJiCpMIen}W58hnRO<{82u ze)p8=fa^*ASjjjdw}*eOoe#|K=6hTnf!Zd);s%Z19u!!HP6>$=9M_S-W<3%7f5a`&|jZoFZ{pJrRnl z7RUWO5pW(Tx_XjJ+BS X@oG+~Y`agMn!Q;-QhJ$r=q}_3mQx_#FZIJs2%eP$&PounMIH3g{mRXVM?LH9yd>K3$-A^hYr-p*;Z zGVy!jw)efVgr(IT{gvl3hT}rfSM9pRDx>}X%(KO1tMK$GfN8md~6}OFqZXByhj-nW+{Z#ww zNZ6^rst$xxCkbd*namxfwNCY+#z=X$sF_kKkdK>M^;AbzO;ty^c9A2T)CupXK=GmK z%+aJ;dxE!U`oe1Nt5B-LZ6+@nwl;m;u5R5`--srU(JKx zvdB4InhxCwz~i2kP0S2ny|>lmw;ixVTaT5l><602kQa*s?Q%w0HBOpHf;_WoF*N~a zzqaZsr?@pj6!2a$9u_MC#tvYu*{Q4}JAw6Jb*u{pu>;vD=4TP~Сделать пожертвование... + - default по умолчанию - + Select one or more input files Выберите один или несколько файлов - + Output File Name Имя выходного файла - + Error reading format configuration. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -683,7 +683,7 @@ This program cannot continue. Выполнение программы не может быть продолжено. - + Some file/device formats were not found during initialization. Check that the backend program "gpsbabel" is properly installed and is in the current PATH This program cannot continue. @@ -692,114 +692,114 @@ This program cannot continue. Выполнение программы не может быть продолжено. - + Input and output formats do not support %1 Входной и выходной форматы не поддерживают %1 - + Input does not support %1; output format supports %2 Входной формат не поддерживает %1; выходной формат поддерживает %2 - + Input format supports %1; output format does not support %2 Входной формат поддерживает %1; выходной формат не поддерживаетt %2 - + Both input and output formats support %1 Входной и выходной формат поддерживают %1 - + waypoints маршрутные точки - + tracks треки - + routes маршруты - + There are no input options for format "%1" Нет входных параметров для формата "%1" - - + + Options for %1 Параметры %1 - + There are no output options for format "%1" Нет выходных параметров для формата "%1" - + No valid waypoints/routes/tracks translation specified Не выбрано преобразование маршрутных точек/маршрутов/треков - + No input file specified Не выбран входной файл - + No valid output specified Не выбран выходной файл - + No output file specified Не выбран выходной файл - + Process "%1" did not start Процесс "%1" не запустился - + Process exited unsucessfully with code %1 Процесс завершился неудачей с кодом %1 - + Translation successful Конвертация выполнена - + Error running gpsbabel: %1 Ошибка запуска gpsbabel: %1 - + Are you sure you want to reset all format options to default values? Вы действительно желаете сбросить все параметры формата в значения по умолчанию? - + About %1 О %1 - + One or more data filters are active Один или более фильтров данных активны - + No data filters are active Фильтры данных не активны diff --git a/gpsbabel/gui/mainwinui.ui b/gpsbabel/gui/mainwinui.ui index 897fbdbaa..0650d3b39 100644 --- a/gpsbabel/gui/mainwinui.ui +++ b/gpsbabel/gui/mainwinui.ui @@ -11,7 +11,7 @@ - MainWindow + GPSBabel diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss index 1f726edc9..bca05e8eb 100755 --- a/gpsbabel/gui/setup.iss +++ b/gpsbabel/gui/setup.iss @@ -16,7 +16,7 @@ ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} AppName=GPSBabel -AppVerName=GPSBabel 1.4.3-beta20110903 +AppVerName=GPSBabel 1.4.2-beta20111002 AppPublisher=GPSBabel AppPublisherURL=http://www.gpsbabel.org AppSupportURL=http://www.gpsbabel.org @@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org DefaultDirName={pf}\GPSBabel DefaultGroupName=GPSBabel OutputDir=release -OutputBaseFilename=GPSBabel-1.4.3-beta20110903-Setup +OutputBaseFilename=GPSBabel-1.4.2-beta20111002-Setup SetupIconFile=images\babel2.ico Compression=lzma SolidCompression=yes @@ -39,7 +39,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ [Files] ; This isn't as wreckless as it seems; these directories are populated on a ; controlled way by the batch file. -Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion +Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion diff --git a/gpsbabel/gui/setup.iss.in b/gpsbabel/gui/setup.iss.in index 90c52cb58..a5f9d6c37 100755 --- a/gpsbabel/gui/setup.iss.in +++ b/gpsbabel/gui/setup.iss.in @@ -37,12 +37,9 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: qtdir\bin\QtCore4.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\bin\QtGui4.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\bin\QtWebkit4.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\bin\QtXml4.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\bin\QtNetwork4.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\mingw\mingwm10.dll; DestDir: "{app}"; Flags: ignoreversion +; This isn't as wreckless as it seems; these directories are populated on a +; controlled way by the batch file. +Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion @@ -51,36 +48,22 @@ Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion Source: release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion Source: release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion -Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs +; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs ; Translation strings extracted from source code. Include it in the dist ; so that users can translate if they want to. -Source: gpsbabel_de.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabel_es.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabel_fr.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabel_hu.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabel_it.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_de.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_es.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_fr.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_hu.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_it.ts; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_ru.ts; DestDir: "{app}\translations"; Flags: ignoreversion +; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion +; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion ; Compiled translation strings that are used at runtime. -; Only Spanish is adequately translated for now. -Source: gpsbabel_es.qm; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_es.qm; DestDir: "{app}\translations"; Flags: ignoreversion - -; German is usable -Source: gpsbabel_de.qm; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe_de.qm; DestDir: "{app}\translations"; Flags: ignoreversion +; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion +Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion ; Now translations from Qt's own UI stuff. Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs ; Miscellaneous -Source: COPYING; DestDir: {app}; Flags: ignoreversion +Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion ; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion ; Source: README.contrib; DestDir: {app}; Flags: ignoreversion ; Source: README.gui; DestDir: {app}; Flags: ignoreversion diff --git a/gpsbabel/tools/mac-config b/gpsbabel/tools/mac-config index c986085f1..cba4191f8 100755 --- a/gpsbabel/tools/mac-config +++ b/gpsbabel/tools/mac-config @@ -5,8 +5,8 @@ case `uname -r` in *) XFLAGS="-mmacosx-version-min=10.4" ;; # 10.5/Leopard esac SRC=. -CFLAGS="$XFLAGS -O -arch i386 -arch ppc" \ - LDFLAGS="$XFLAGS -arch i386 -arch ppc" ${SRC}/configure \ +CFLAGS="$XFLAGS -O -arch i386 " \ + LDFLAGS="$XFLAGS -arch i386 " ${SRC}/configure \ --with-libexpat=${SRC}/mac/lib/libexpat.a \ --with-expathdr=${SRC}/mac/include diff --git a/gpsbabel/tools/mac-localize b/gpsbabel/tools/mac-localize index c23ac568b..660dbc202 100755 --- a/gpsbabel/tools/mac-localize +++ b/gpsbabel/tools/mac-localize @@ -2,8 +2,8 @@ # the application menu and system buttons. See description at # http://doc.qt.nokia.com/4.6/mac-differences.html#translating-the-application-menu-and-native-dialogs -QTDIR=/Developer/Applications/Qt/translations/ -LANGDIR=objects/GPSBabelFE.app/Contents/MacOS/lang +QTDIR="/Developer/Applications/Qt/Qt Creator.app/Contents/Resources/translations" +LANGDIR=objects/GPSBabelFE.app/Contents/MacOS/translations mkplist() { @@ -11,7 +11,8 @@ mkplist() { [ ! -d $D ] && mkdir $D sed "s/LANGUAGE/$1/" ../tools/skeleton-locversion-plist > $D/locversion.plist # optional as en, it, and hu aren't translated in Qt yet. - [ -f $QTDIR/qt_$1.qm ] && cp $QTDIR/qt_$1.qm $LANGDIR + [ ! -f "$QTDIR/qt_$1.qm" ] && echo "Bad QTDIR" + cp "$QTDIR/qt_$1.qm" $LANGDIR [ -f gpsbabelfe_${1}.qm ] && cp gpsbabelfe_${1}.qm $LANGDIR } diff --git a/gpsbabel/tools/mkchanges b/gpsbabel/tools/mkchanges index 12db347d5..13c056ffd 100644 --- a/gpsbabel/tools/mkchanges +++ b/gpsbabel/tools/mkchanges @@ -1,4 +1,29 @@ # cvsps -u + +svn log | awk ' +skip = 0; +/^r[0-9].*lines?$/ { + if (count > 0) printf " \n\n" + printf "\n %s\n ", $5 + count++; + next +} +/^----.*----$/ { + if (skip == 1 ) printf "\n\n" + next +} +/^$/ { + next +} +{ + skip = 1; + print $0; + next +} +' + +exit 0 + cvsps $* | awk ' /^Date:/ { logt = ""; diff --git a/gpsbabel/tools/mkdmg b/gpsbabel/tools/mkdmg index 9a2f61ec8..aa63b904c 100755 --- a/gpsbabel/tools/mkdmg +++ b/gpsbabel/tools/mkdmg @@ -8,10 +8,10 @@ QUIET=-quiet checkgpsbabel() { - file $1 | grep -q "2 architectures" || { - echo $1 is not a universal binary. Aborting - exit 1 - } +# file $1 | grep -q "2 architectures" || { +# echo $1 is not a universal binary. Aborting +# exit 1 +# } otool -L $1 | grep expat && { echo $1 does not staticly link expat. Use tools/mac-config exit 1 diff --git a/gpsbabel/xcsv.c b/gpsbabel/xcsv.c index 5fc11b073..46e524d66 100644 --- a/gpsbabel/xcsv.c +++ b/gpsbabel/xcsv.c @@ -602,8 +602,10 @@ xcsv_wr_init(const char *fname) { /* if we don't have an internal style defined, we need to * read it from a user-supplied style file, or die trying. + * 8/19 - add test for styleopt to ensure that a write of a style + * after a read of a style works. */ - if (xcsv_file.is_internal) { + if (xcsv_file.is_internal && !styleopt) { xcsv_read_internal_style(intstylebuf); } else { -- 2.30.2